From: Dan Nicolaescu Date: Wed, 9 Dec 2009 06:04:09 +0000 (+0000) Subject: Fix short log parsing and fontification. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8995 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4fee80dbb73114db5f5aec4ae3684655ee3e4b84;p=emacs.git Fix short log parsing and fontification. * vc-bzr.el (vc-bzr-log-view-mode): Match dot in revision number. Fix fontification for the [merge] label. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 43e9d9904a2..a571757b995 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-12-09 Dan Nicolaescu + + Fix short log parsing and fontification. + * vc-bzr.el (vc-bzr-log-view-mode): Match dot in revision number. + Fix fontification for the [merge] label. + 2009-12-09 Vivek Dasmohapatra Drop some properties to avoid surprises. diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 13a3eb12b16..ae6117d1891 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -462,7 +462,7 @@ REV non-nil gets an error." (set (make-local-variable 'log-view-file-re) "\\`a\\`") (set (make-local-variable 'log-view-message-re) (if vc-short-log - "^ +\\([0-9]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" + "^ +\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")) (set (make-local-variable 'log-view-font-lock-keywords) ;; log-view-font-lock-keywords is careful to use the buffer-local @@ -472,7 +472,7 @@ REV non-nil gets an error." (1 'log-view-message-face) (2 'change-log-name) (3 'change-log-date) - (4 'change-log-list)))) + (4 'change-log-list nil lax)))) (append `((,log-view-message-re . 'log-view-message-face)) ;; log-view-font-lock-keywords '(("^ *committer: \